added argument check, edited cfg
reflecting implemented...
Merge branch 'reflect'