More Symbols! Minor enhancments.