Small fixes and more verbose information