Cleanup, tweaks, bugfixes, robustification