fixes and modifications to wqx_mappings; minor cleanup