Add Ordinator and some minor fixes