Added abbey, updated wimpy in some of the others