Fixed small issues and refined