womp womp womp

misc fixes and reorganizations