Fix minor bugs/style issues.  Fully functional