fix & improvements