take back in some elements from the reverted patch that still make sense based on code review by Moc, thanks