bug fixes and bump to version 0.0.2