fix all the bugs since meeting on Saturday