fixes and cleanup of signatures_controller.