clean up labels
only suggest main builder class
fix possible NPE
fix bundle name
some fixes