Few last fixes
calc changes