Mass Update

Alot of updates from a list of changes sent through from Marc, think
this is me about done.