small stuff and removed andy's fix for quotes