some small fixes from the list