Updates working in a slightly better way now.
Cleaned up a bit, added some notes.
Added some name to id and id to name mapping traits.