added dist, fixed issues