minor tinkering and todos