added comments and on_exit back to Page