Work dump
Misc improvements