cleanup and merge of current commits