Roadmap additions and cleanup