improved general handling, bet more verbose