No blank targets, and various hyphen etc. fixes.