improvements, + support for puppy