Renaming, bug fixes, end_date added