More docs, cleanup, add some filter logic