cleanup some lint warnings
todos to revise friction calculations