. Started fixing bugs and testing