bind -> bindCommand, bindGenerator -> bindCommandGenerator
Cleanup, error handling, reorganization.