Fixed some more glitches
Merged code branch stuff