Fix credit command and add keywords