Small tweaks, extensive testing, seems to be working well