Finished updates

These are all updates that will be done for 2.0