Clean up, Aisle 7

Fixed some of the pNight properties for saving and updating