minor changes after 'initial commit again'