A bunch of useless improvements to Architect