Fix minor bugs,  Add prime pillar (currenly only works when there is a tool change on every layer)