Final Changes

Final Changes - Fixed strings being truncated.