made new calculations class, updated mainactivity and settingsactivity