Fixed spaces, and added quoting package