Fixed & expression, added some additional arch. concepts