Simplify goput, fix hmp bug