Fixes and additions

Lots of small updated I had sitting around