Some work on the bugs