minor changes, naming