Finally, peace

some tests on the rendering but done!!