Some bugs fixed. Commit just a landmark for when I return to the project at a later time. Darn school.