bug fix and some cosmetics

12 jobs for hmc in 13 minutes and 5 seconds (queued for 2 seconds)
latest