Addition of a few things, rearranges. This commit is to get some feedback, along with the last ones.