Fixed some broken references. Cleanup.