Some finishing touches