Fix some documentation issues
Fix circular dependency + add indep. filter by info string