Stuff

upgrades, comments, misc. improvements