if: empty statements; minor catches and polishes