tutorial and misc. fixes