Updated/added names.
Merge branch 'bugfixes'