Fixed bug with constructor override. Also cleaned up some of the sample.