Many changes, added teaching page