bug fixes, slurpy changes