Better cross-linking of functionality.
Reverted a supposed bug fix that was actually erroneous.
Fixed bug reported by Paulo.