final fixes and Description update for merging to master