found mistakes, fixed