more tweaks, including a bugfix due to turbach