[FIX] Quotes can be used now. Various fixes