Vainly: Minor Bug Fixes

Fixed several minor bugs that were immersion breaking.