kevin's fixes
kevin's fixes