Bug fixes, dealing with quotes, etc.