Fix for #215 and some other related improvements

what do you mean?