small physics things
merged stuff