some minor tinkering