Removed semicolons, fixed initialValue typos
Merge branch 'dev' into bug/cleanup_syntax
Merge branch 'bug/cleanup_syntax' into dev