Cleanup; Map tweak; Sound fix