fixed some issues that I had already fixed but clearly not committed in the right way