Merge from BS12 master

Note #1: Aviskree's currently broken and will need to be readded/fixed as we go along (I'm not sure how bad it's broken. Assume extremely).
Note #2: Holy mother of crap expect bugs. I fixed what I could find but it's simply too big for me to test alone.