minor fixes, removed duplicities