Various
    remove typepermissive statements again
    tie some loose ends