Mostly Done
A few more updates