Fix some references, double labels, etc
Tags: Added new tags