fixes

functionality for @vocab
fixed function object
removed commented out text, general clean-up