Alright, I have those changes posted up in the initial comment, let me know what you think!