More bug fixes, and clean up