Use NBSP where appropriate
Rename to match other make*.py scripts
Minor
Fix bug tracker link

Thanks to Mohammed Assar.