fixed being able to navigate to the future.

also reordered the functions.