Few fixes, added prints