fixed the bugs from yesterday