Cleaned up time code and fixed for travel classes