bug fixes (ignoring empty lines in CPVar)