Began work on handling quotes in tokenizer and fixed indentation