Update how ON and SIG is initialized/finalized
Fix some comments and arguments.