fixed a few things
done