Round 2: More Bug fixing and refinement