All bugs should be fixed now.  Still not fully activated, just in case.
fixed the last of the bugs and added more comments
Added some more comments