much cleanup / fixes of backbone code