fixed some oversights