Updated demos
Refactor and mass cleanup of the DLL
Fixed additional bugs