more bug fixes
dependencies arent duplicated now