Glos bug fixes, testing