Better handling of 0 hits
Fixed paths