various fixes
Merge branch 'master' of github.com:the-alien/metacpp