few bug fixes
formation changes