Fixed syntax error
Adding more bugfixes
Merge branch 'master' into wip-fork
Identified another bug