fixed some things that was wrong