some editing and questions answered
merge fixed