Added drawing of other shapes (e.g. cone). Some minor changes