fixed dependencies
naming n stuff