added cone/cylinder; need to work out scaling