complete coverage + fixes