Fixed string issues; still need to rm space bug