Add comments and fix game