fixed last mistakes