Improved bacter splitting logic, etc.