Fixed arguments and improved filters
Fixed
Fixed docs
Fixed pri
Merge Master