bunch of changes, added quotations