Move things around; Display if methods are static in the overview table;
sync with official tutorial