I think I have the first 3 items here patched up, for now. Still need to look into the last item here.
