String Constant and bug fixes