Most operators now working; commencing rstack fixup