Found some bugs & improvements