more logic comments
Merge branch 'master' into playground/svg