Adding docgen and controller tweaks.