closing in on #57 fixing minor bugs
closed last must issue from the bugs in flow #57