adding bunch of missed commits from yesterday