minor cleanups, restart option