Added strings and fixed parsing bugs