small changes
some merges