primarily performance and correctness lint fixes

// FREEBIE