math trig and hyperbolics, language stuff
fix comments merge