fav sample removed
Some client methods renamed & charges renamed to charge-list