minor fixes
reviewing from beginning