fixes for thigns that didn't work and stuff