added pm open to am day incriment, other refacotring