Some work in pet-system, Kiljaeden corrections, etc.