fix: numerous fixes