Issue 192 expose fields for options

Fixed tests, cleanup. Addressed points 1-3.