add support of symbols (not longer limited to circle) + some quick code cleaning