Should work now.
Cleaned up references.