quick bug fixes from testing review