Coding Style Fixes, Label Management, Bug Fixes