fix alot of thing