fixed alot of bugs hopefully...