v0.3 - various enhancements