Small fixes; preparing svg