Looking to the future, also misc changes