minor reorgs
move all component reference init to Awake()