Added some sanity checks, cleaned up so bad/changed package names and cleaned up the output.

Signed-off-by: digimer <digimer@alteeve.ca>