most self-powering issues cleaned up