Updated Fee calculation and debug