Bug fixes for energy of bonds + water constraints in Gro->Des