Finishing touches, no actual changes to code