fixing obvious problems
fixing more obvious errors