Edited the time fixed some small bugs