fixed something here and there