a shit load of stuff
fixing some nits
merging