minor fixes
Merge branch 'single_table' of https://github.com/pachocho84/CM2 into single_table
minor fixes