actually set quotes
fix/add missing booleans