some tweaks to prepare for first results