updated references, etc.