FB_34,35 implementation. Other cleanup and minor refatctoring