Too much for this PR, doesn't really concern this PR, as i said maybe some other time.