Bug fixes + cleanup.