[r.s.d] various fixes and improvements to our automation