Some minor changes; Cleanup a little and improve coverage.