Payment step in order process + misc fixes