fixing some
done