Cosmetic fixes, activities WIP