bundle update and minor fixes