bug fixes and 0.2.1