final tweaks, kinda messy