MAJOR FIXES AND DETAILS ADDED