Bug fixes & kitty geyser