First version
Small fixes
Cleanups