minor changes galore