Initialization cleanup
nlocation
nlocation fix
Small typo fixes