Cat Creator

Bug fixes...