Few tweaks & modifications

I've made a few modifications, each on it's own commit. I saw them necessary.