Doc/overhaul

Lets merge this thing before gets too late.