added latest (and ideally final) version of calculator files