Rework types somewhat, boot.l loads even further