small fixes + time handling