Updated alot of thigs