removed some of the visual bugs