made few final changes