more changes

Fixed some things, hope I did not break others