tutorial and some import fixes