Small changes, Better support for Croogo!;;;