taps done; many compiler warnings eliminated