comment generated controller + a few tweaks