Enhanced 12/24hour logic
updated aux with the latest changes