Code tweaks, new statuses and mace