Random fixes.

Cool project!