Added more indexes.  Alphabetized mapping list for ease of search
Removed some old dynamic methods that shouldn't be used anymore.
They were causing conflicts with rendering styles.