Add some logs & minor fixes