Generated Controller and minor bugfixes
Generated Controller and minor bugfixes