working through the bugs