fixed bugs, has merchant revenue code