CRA-510, CRA-511, CRA-516: Added more consistency checks, fixed warnings from grammar check. Added a parseCurrentValue function.