tweaking mass and friction; cleanup comments