Minor fixes + added resource-bundle