All functions updated (still no plotting functions)