Fixes for re-sourcing

Still needs more work, since I can't resource quite right
Fixes for new powerline, and other things