fix & finish