Calculator enchanced, small upgrades, todos removed