New keywords, fix debit bug