syntax fixes
IMPORTANT: code refactor, please PULL / MERGE & RESOLVE CONFLICT immediately
Merge branch 'master' into feature/pv-to-central-hook