Only return definitions.
Fix bug.
Some fixes.
Handle invalid command.,