Egal
Bug fixes 2