Morelatenightchanges

should resolve issues #148 #158 #159 and #160