lots of tweaks over the last several weeks :)