Refactored some stuff, fixed a bug with the start & end-dates