Some clean up and fixing minor errors.