added activities, calculator - big update