Updates to Efficiency Calculator and main before big change