update features, fixing bugs