reorganized, cleaned out some junk, fixed some code
Merge remote-tracking branch 'refs/remotes/origin/master'