More single to double quotes, and added some works in progress