Misc changes
Finished updating and testing