Minor fixes. Some leap trainer config adjustment ongoing.