Changes week 3 September

General changes and improvements