New state AE and various fixes