added base of economic metric calc. fixed bugs