some changes to the force systems and some general cleanup