Better rendering of documentation & minor changes