Added/extended grammar for names
Various fixes provided by Shon Love