Add more log
Some fixes