added .name back, fixed DB