I've made some changes, thanks for the feedback last time