Fixed minor bugs, ready to implement bonus challenge.