Remove camera from Player, attach programmatically.
Some tidying up.
Minor tweak.