MoLAoS bunch of changes including parts of new pet system