Swapped asterix for plus for lists. They were not being interpreted correctly before
Further formatting fixes...