Added start and end date and fixed a lot of small bugs