un-TODO an unnecessary bit
shorten some names
make svg fit content better