Fixed some bugs. Increased mock success rate.