dwemthy and rabbit files corrected