More clean-up and typo/bug fixes