Made it 24 hr, fixed bugs