few more fixes
Adding HMC