Please consider the following changes

Hello,

I've made several changes that I guess could be merged

Cheers