Misc. Additions

Lots of different additions and stuffz