several changes, reverting the power leakage fix.