Updated state mappings
Added hour corrections.