fix a error
remove commented code
HangingBonus
cast to int
Merge remote-tracking branch 'origin/master' into Extra