update comments and adjust margins