refs #952, some bug fixes from previous checkins