fixes bugs down the road