call backs and minor fixes