just fixing some bugs, let iteration three begin