fixed some things
more