updated other references. probably still broken