fixed almost everything and deps work