more freaking fixes.