Some fixes to UG, remove package doc, as it reverses the marginpar and todo notes.