Add traps for sigint and some other minor stuff