bug fixes 12/11