Improved interface, fixed bugs with quotes