cleaning up more mistakes