beta 7 WIP d

fixed formation phase which I broke last commit
fixes #53
fixes #54