Resolving conflict with live version of slice.php (+a few minor