Refactored beach trip; added more emotions; added haircutting event