Fixed TIME and other BUGS

FIXED BUGS and TIME