bug fixes and preparation for experimental runs