Testing, improving and some doc (WIP)