final commit of stuff

Assorted stuff I modified