Merge of Adams branch and additional pieces