Various bug fixes. Added a border and a second cat.