More tweaks
Implement citations