Added location info to nights.  Also updated Player model to be more correct