More bugfixing and functionality addition for force reorganization