Fixed it not working when using complex ctor
Updated generators
Removed pointless generator
Added some screens