Issue 192 expose fields for options

merged master and a little cleanup