fixed various bugs afffecting time remaining