Setter phpdoc types in generator
Minor bugfixes and code style issues