cleanup, get quotes working again

and providing explanation for hacky hack