Minor changes in factors. Still many corrections to make