sundry missing packages
port over Stahl's original layout