I didn't see the pre-edit version, but it looks good to me.  One, admittedly minor, gripe though:

[quote]He can play a guitar.[/quote]
There are guitars?  I mean, the word was around in the 12th century, but it didn't refer to any one specific instrument, but to a variety of chordophones (instruments that generate sound using vibrating strings).  That, and it seems a bit off-aesthetic.  I would say a lute or mandolin would be better.  (When I said the gripe was minor, I [i]meant[/i] it.)