Step 8, address all but one remaining todo in on_chain.rs

Step 8, address all but one remaining todo in on_chain.rs #340