Add some logging & code improvements