fixing some mint issues, upgrade to calculator