fixed some things