A few more changes...time to stop and get more context on specific pages