Add remaing type annotation variationns.
Improve generic type resolution to cover bounds
Improve printing and safety