pulled and merged with kevin
Synopsis and validation
Added some comments
merge error fixes