Even more modifications

Quickie proves to be more than just that will all these modifications.