added timgraham fixes