Improvements to references

- [x] list references
- [x] minor improvements