small fixes again