cleaned up and fixed dependencies
build