clean & minor fixes