revert mod power for all
format
fix more rebase errors
stll 30 errors left