fixes and cmp + recover coverage