BUGFIX quote correctly
RESTRUCT some extra hygiene