calculator fragment, some other changes