Externalized string
bug fixes