bug fixes since 4:26 pm 3/26