a bit more clean up
a few minor updates