minor modifications for final release