Edited some scaffolding some more.