Debugged some problems that occurred after bike2ski's most recent set of changes
pushed
pushed