add option for signing + cleanup