Fixing more stuff, working on adding new now