cleaned up cols/dia wins etc