Working

Updated usage statements for accuracy, added todo list, finished test cases and corrected some bugs.