Minor changes

If you don't like everything in here, just cherry pick what you like.