add status handle, small fixes