More clean-up and bug-fixes.