Made most of the changes requested by Eran Toch