environment attribute changed to architecture, typos