quickfix updates and organization