Implement the remaining MRU functions, fix a couple of differences