added sortByTime and other settings
added some packaging for delivery