bug fix & improvements