Progress with models; change cite to directive; simplify format filter