Added simple pillar; some small tweaks