cleanup, small fixes