Fixed some reflection issues, removed comment blocks, and cleaned-up
some other stuff before merging into dev