Pass-Opt v2.1 :D

Added Typey and removed small bugs