Fix for #215 and some other related improvements

yes, nothing wrong here