bug fixes on dec 27 morning