Minor improvements

-Created helper functions
-Created more methods
-Still tracking down bug sources