fixing more mistakes