Various files updated, primarily Calculator