Directions added, untested
fixed merge conflicts. lot of new changes..