updated functions, now 13 calculation and 120 drawing functions, consistent with wiki