Updated a few things

Feel free to merge