Fixed Issues from V-4.0.1 Doc + Minor Fixes