slight changes to a lot of things

just trust they are good