Fixed Mathias modifications, added Olaf and Flo.