added auto-incremental skus, clean up