various fixes
Release 0.1.3