Lots more tweaks and fixes. Seems to be working flawlessly.