changed input generator to reproduce inputs from the bug
deleted linking to a library that is not being used anymore
resetted values of hs to prevent double counting in hm
Merge branch 'bug001'