Fix warnings, add calculate_forces