Pull mah commits!

Worked with Allen, looking through some stuff. Fixed a bug, made some small changes. Whatever :)

PULL IT! PULL IT NOW!