Options reorganized and current descriptions added.