Fixed bugs: ready to start!