small changes here and there, getting ready for the merge
I think this is better...