would be nice to add these things and the coverage in the separate PR