Some bug fixes, and added nonbondeds.