addressing PR comments and fixing ci