Some comments.
Some untested additions.
Source\Keyword validation