more services uses macros, small fixes
Merge branch 'master' of https://github.com/plutooo/3dmoo