a couple tweaks, 100% working now