v2.0 working build

fixed null pointer errors to create a working build