Fixed install dependencies, and missed files in last commit