hopefully fixed those redraw bugs