Final changes

Commenting + Fixed Wizard class to include roadblocks