fix origin skipping and added maxPast and maxFuture
streamline max options