syntax errors and bugs induced by adressing PR comments