VARIOUS FIXES

YEAH