bunch of tweaks, getting close