ansible improvements
manual improvements