setup for new run

plus minor bug fixes