more mistakes resolved