Some updates and fixes
Update to 0.3.3 release