Updates for string handling and basic math