svg fixes and cleanup