26/6 evening heng

Ever 4.1 and fixes for Ever 4.0