More fixes

I closed the other pull request.  This one includes the previous + a minor fix to correct a friction problem.