Fixet alot of stuff