Stuff

some upgrades and comments and other small stuff