Fixed time conversion
Slight changes to server