more dynamically generated typesigs and bug fix