support for typescript & bugs