Important bugfixes and new scaffold page