made final changes and additions