Making minor fixes and final improvements.