finished updating to kirby 2, minor changes