Fixed a lot of things and slowl merging over the calculator