Fixed string issues and did other minor adjustments