fix cylinder.  change shape constructors.  change quadratic's return from a list to a tuple.