changes to a lot of stuff -dont remember what