minor improvements, started to attach svg wrapper