squished some bugs, refactoring some methods