numerous lint fixes.