updated String handling and Messages to fix issue 1