tons of tweaks, bug fixes, and polish