Small fixes and testing new criterias.