close #15 + various other fixes/changes/improvements