work on scaffolds and misc other features