v0.2.1

A few more fixes...