some bugs fixed etc#11

Open

jobonaf wants to merge 10 commits intowrf-model:masterfrom

Commits on Nov 20, 2018

some bugs fixed (typos, wrong labels, etc) to avoid errors and warnings
jobonaf
committed

Commits on Nov 21, 2018