Added correct time calculations.
Without Search and GUI