Refined some label handling, etc