massive fixes