Revised New Jersey nuclear bill includes efficiency, solar initiatives