fixed recursion stack errors and simplified handler assignment process
Merge branch 'game_logic'