more fixing debug stuff