Fixes
Update references
Add reference
More work