Adds/reworks some minibibs