fixed project setup
added uncommitted files
removed jar, added null check