Fixes and further feat 0.5