Fix #3 and #6; changed how deps are installed