Fixed number and time inputs
Added multiple calendar support and improved times