All fixes

Should the back-and-forth with rebasing / etc.. be too much hassle, This pull request contains  #92, #94, #90, #89, #87, #86 (with all commit intact)