fixed all the wittle type errors, etc