small additions, roadmap for later