Organized stuff and fixed lots of bugs and added stuff