Removed p0f since it is being pulled later.
Added a few missing packages; code cleanup.