fix syntax errors
Merge branch 'prototypes' into integration