Fixed up some code, TODO filters and total active items.