Repair Inverse Bug
Refactor and Comment
Merge remote-tracking branch 'origin/gamelogic'