massive update
Minor changes + Nunit