package names and minors

Some fix for #64 and also fix for #66 and #67