Changes

did a lot :)