Fix syntax, reorganize and add filters and doc