errors fixed, debug lines cleared