Inserting a date and location

Yes good ideas for improvement.