Various changes to berggren