complete reservation + some fix