Added the beginnings of an US calendar
Various fixes