First commit; few syntatical changes and Protyl-specific changes to metadata
More syntax modifications and cleaning up