integrated to core + simplified calculations

- clarified terminology in comments & changed variable names
- simplified calculations
- addNotes still wonky