fixed some things, some still not