Some error checking added
some additional fixes to reservation code