Some fixes, additional information output added