cleaned up, x axis time fixed