Updated comments, cleaned out obsolete code

Still need to address minor bugs and server 500 errors.