made long version + flows better
minor corrections
reorganize and small corrections
minor fixup in activities