time class fixes and other stuff