space and quote fixes