finally commiting after merges; cosmetic changes