fixed more mistakes