a few tweaks... it's been a while since my last commit so i don't really remember exactly what's in here now.