Adjustments for libHeaven/topic/uncrappify1

WIP WIP WIP WIP :-)