DialForce support and some cleaning