refactor fixes

drastic refactoring calls for bug fixes... from here on out life is good