Making fixes to cerere de ordin and other stuff