This has bugged me for days...
Minor changes.