included Russell's fixes.