minor changes, tinkering