Added some more stuff and fixed alot of bugs