Small overhaull

Some minor changes, still need info for headings.