fixes + K1
Merge branch 'testing' of https://github.com/alberto-brigandi/MSHCI into testing