More cleanup/fixing stuff!

Wheee!