Main fixes, code cleaning in OlympianManager