minor fixes; additions