reorg tootorial
fixes from bootcamp
temporary add