quotes and bugfix.