Comments and final fixes