I write so rarely, Vaderios, but you happen to be my answer policeman in OT.com because allways when I post something, you are the first who answers!
But thank you and I'm happy to see so much of your input in this edit; I really like your taste of colours and imaginative visuals / corrections in sort of modernised SW way... it would had been so nice if you would have taken it from McQuarrie in 1998 or so...