Added dates, fixed header + some bug fixes