Some small tweaks

Code was broken, and changed external libs to nuget