My merged

Reviewed all changes from the weekend.