fixing some more mistakes