Updated to-do
unnecessary merge conflict resolved
Code smells in frame.js cleaned up
Code smells in game.js cleaned up