minor label changes and bug fixes