add some cats, and tidying.