Fix code and update hammer dept to 1.x