merged forcefield to main and fixed up a little