cleanups and fix sketch