adding new scaffolding, fixing link errors