I've made a few additions like you asked, I'll go back to it when I get back from school.