Some improvements to Skjarinn activity, still buggy