many a small fixes