tabs & minor fixes