Scatter bugfixes
Cleanup