#284 more bugfixes

This has conflicts so it won't let me pull

I think it's sister.qsrc, It's been updated recently, can you skip it? or how can I merge updated file and fix it to pull again? sorry this is all new to me...

I think I can do it manually. Just sorting through it

The sister and mother files had been fixed this end already so didn't merge those fixes, the rest have been merged. Thank you!! :smile: