Added "unique" attribute to field.
Bug fix.
Cleanups.