updated to 0.2.2

A few fixes as well