New lesson and old fixes