fixed issues locations issues and added more deps