cleanup and fixing oversights