Finishing touches: project fixup