cleanup and tinkerings