Clean up, bug fix.