minor changes
some merges