Add sample filter, update obj types, behave better when network is spotty