fixes according to words from promoter
tasks on asana (reorganization)
Merge pull request #14 from badeleux/master

promoter fixes