cleanup
leakage fixed
fixed map renderer quoting and renderers test