First test version
Misc improvements