Fixing underscores
Some more activities
Work on actions