final small fixes