Increase facts coverage, and fix a bug in the process :)