some final small fixes