added more time info + fixed a time botleneck