Close ticket #293, smaller improvements

This PR closes #293 and adds some smaller fixes and improvements