Fixing bugs and completing Unbeatable implementation