small improvements/fixes; v0.1.1