preformance improvements, crbm fixes