minor updates and tinkering