* More bug fixing done

 ! V2 IS NOT RUNNABLE YET !