fix some wierd typing issues and add dependencies