Small revisions to prepare for final release