squash: wip
-
-
few minor bugs fixed
bumping for tag