added scaling and stitching, and other general updates