fixed a few things
merged master with my stuff
merge, hoping it all works out okay