updated default physics variables
fixed merge conflicts