updates for calculator and type library changes