Few fixes and more details