updated tutorial and misc. fixes