Overall, it looks good.  

I have made changes to the NP15/SP15 use.  
Adding a f to of
Adjusting to reflect that Saturday is an on peak day for SP/NP
Articulating why ON Peak: OFF Peak is not an appropriate rate design goal