Many minor bugfixes, +additional functionality pertaining to CxParser