Well I think the mess is fixed
Ok, obviously this are kind a important.
Little fixes