final commit. completed activity log and refactored code