fixed some dependancy issues(these need to be readded)