Fix main bugs I was seeing; actually trigger correct action number now for mocking objects when switching from GUI.