Changed a few things

And now you won't hear from me for a week because I'll on vacation