fixed alot of stuff