bug fixes and efficiency updates by Tom Aarsen

• Resolve several breaking bugs.
  

• Perform a large optimization regarding string normalization and KeyedVector membership.
  

• Perform simple code optimization each localized to just a few lines.