Cleaned up CQL/OGC sections and other minor updates