fixed CONPJ in fimmbraedra
fixed CP to CP-QUE in vilhjalmur