added 12/24 hour clock option