Small Fixes
Grammar
Add Callable