Fixed umlaut bug (thanks Mario), cleaned up a bit