Merge of Ace's changes, among other things